From 09f9ad2f69d191507aa6e0f417fa73a7a6f817d8 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 27 May 2008 10:35:10 +0100 Subject: [PATCH] Fix 17725:c0c0f4fa8850: use type paddr_t instead of unsigned long for physcial memory address Otherwise, the address overflows on PAE system with memory size > 4G. Signed-off-by: Yang, Xiaowei --- xen/arch/x86/setup.c | 6 +++--- xen/arch/x86/tboot.c | 6 +++--- xen/drivers/passthrough/vtd/iommu.c | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 94504c5561..ac1aa93891 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1100,10 +1100,10 @@ void arch_get_xen_caps(xen_capabilities_info_t *info) #endif } -int xen_in_range(unsigned long start, unsigned long end) +int xen_in_range(paddr_t start, paddr_t end) { - start = max_t(unsigned long, start, xenheap_phys_start); - end = min_t(unsigned long, end, xenheap_phys_end); + start = max_t(paddr_t, start, xenheap_phys_start); + end = min_t(paddr_t, end, xenheap_phys_end); return start < end; } diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index 37841c41fa..ec4aa9436d 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -96,13 +96,13 @@ int tboot_in_measured_env(void) return (g_tboot_shared != NULL); } -int tboot_in_range(unsigned long start, unsigned long end) +int tboot_in_range(paddr_t start, paddr_t end) { if ( g_tboot_shared == NULL || g_tboot_shared->version < 0x02 ) return 0; - start = max_t(unsigned long, start, g_tboot_shared->tboot_base); - end = min_t(unsigned long, end, + start = max_t(paddr_t, start, g_tboot_shared->tboot_base); + end = min_t(paddr_t, end, g_tboot_shared->tboot_base + g_tboot_shared->tboot_size); return start < end; diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 063d713279..fe17f4a77e 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1074,7 +1074,8 @@ static int intel_iommu_domain_init(struct domain *d) struct hvm_iommu *hd = domain_hvm_iommu(d); struct iommu *iommu = NULL; int guest_width = DEFAULT_DOMAIN_ADDRESS_WIDTH; - int i, adjust_width, agaw; + int adjust_width, agaw; + u64 i; unsigned long sagaw; struct acpi_drhd_unit *drhd; @@ -1102,8 +1103,8 @@ static int intel_iommu_domain_init(struct domain *d) if ( d->domain_id == 0 ) { - extern int xen_in_range(unsigned long start, unsigned long end); - extern int tboot_in_range(unsigned long start, unsigned long end); + extern int xen_in_range(paddr_t start, paddr_t end); + extern int tboot_in_range(paddr_t start, paddr_t end); /* * Set up 1:1 page table for dom0 except the critical segments -- 2.30.2